Allow gtk_label_set_attributes() take NULL. See bug #128517.

2003-12-04  Mark McLoughlin  <mark@skynet.ie>

        * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
        gtk_label_set_attributes() take NULL. See bug #128517.

diff --git a/ChangeLog b/ChangeLog
index 27cce4ec11b8c723d5c2454413bf65804a1a3758..4a0e26ed35409542f893e3d7f09b57ea3fe1bde7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-04  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
+       gtk_label_set_attributes() take NULL. See bug #128517.
+
 2003-12-03  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 27cce4ec11b8c723d5c2454413bf65804a1a3758..4a0e26ed35409542f893e3d7f09b57ea3fe1bde7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-12-04  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
+       gtk_label_set_attributes() take NULL. See bug #128517.
+
 2003-12-03  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 27cce4ec11b8c723d5c2454413bf65804a1a3758..4a0e26ed35409542f893e3d7f09b57ea3fe1bde7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-12-04  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
+       gtk_label_set_attributes() take NULL. See bug #128517.
+
 2003-12-03  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 27cce4ec11b8c723d5c2454413bf65804a1a3758..4a0e26ed35409542f893e3d7f09b57ea3fe1bde7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-12-04  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
+       gtk_label_set_attributes() take NULL. See bug #128517.
+
 2003-12-03  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 27cce4ec11b8c723d5c2454413bf65804a1a3758..4a0e26ed35409542f893e3d7f09b57ea3fe1bde7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-12-04  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
+       gtk_label_set_attributes() take NULL. See bug #128517.
+
 2003-12-03  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b45ba9b605e024b2dfa59d9e7626a7ef9bb7036f..874baf1caa0b32f6962e9071f0eaee1217fdf99f 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -874,7 +874,8 @@ gtk_label_set_attributes_internal (GtkLabel      *label,
 
   if (!label->use_markup && !label->use_underline)
     {
-      pango_attr_list_ref (attrs);
+      if (attrs)
+       pango_attr_list_ref (attrs);
       if (label->effective_attrs)
        pango_attr_list_unref (label->effective_attrs);
       label->effective_attrs = attrs;